Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev