Merge "Update keyguard message area layout" into tm-qpr-dev