am ad8af546: am 9b4dc0f7: Merge "Fix 6396479: Made FUL unlock layout look good...
am ad8af546: am 9b4dc0f7: Merge "Fix 6396479: Made FUL unlock layout look good on nakasi" into jb-dev
* commit 'ad8af546':
Fix 6396479: Made FUL unlock layout look good on nakasi