am e7fd914c: am 24b85a50: am e7e6a3ed: 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

* commit 'e7fd914c35154e323136c86086f26b595cc5fc8e':