Merge "Fix unable to resume show-when-lock activity"