Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev