am 64988f9a: am ef0a4938: am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev

* commit '64988f9a5022a3e0458416cc829fbdec267b5edd':
  Honor hide pattern on crypto screen