Merge "Fixes a crash with KeyguardStatusView in tests" into qt-r1-dev
am: ffb7b7feff

Change-Id: Ic33597abd76a9d3250022223f72ced6871197ad1