am 0e44a6be: Merge "Don\'t finish noHistory="true" activities behind the lock screen" into jb-dev

* commit '0e44a6beeae8a17e81145b83f2dfb8f719d41f52':
  Don't finish noHistory="true" activities behind the lock screen