Merge "Changed behaviour on main Activity relaunch to finish immediately for...

Merge "Changed behaviour on main Activity relaunch to finish immediately for clockwork devices to accomodate clockwork's exit to the watchface on screen off." into lmp-sprout-dev