am 6e43e974: am 32203364: am 9944e673: Merge "Adding new layout files for timer UX" into lmp-dev

* commit '6e43e974dec207bedafe10cade189f21290c8807':