Merge "Honor hide pattern on crypto screen" into lmp-dev