Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev