Merge "Fix NPE for devices that don't use a lock icon on the bouncer." into qt-dev
am: 55bf4fd6b6

Change-Id: If39b55c2c62760ad8db0ba37cbfaefc94694a6a8