Show "Return" irrespective of the current System status

Bug: 1007789
Change-Id: I189a06ee8f1ac4c6892eb722eee7fa3e51aff724
Merge "Show "Return" irrespective of the current System status" into develop