am eceef837: am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev

* commit 'eceef837e34e6860ad532d15402435606550f3fa':
  Ignoring FUL unlock signal if user changed fixes b/7572354