Merge "Don't finish noHistory="true" activities behind the lock screen" into jb-dev