Merge changes I064c31b8,I30facf06 into main

* changes:
  [flexiglass] Add view+viewmodel layer support for 2-line bouncer messages
  Show unlock with fingerprint only for devices where the fingerprint sensor is not below the display