am 3288d56a: am 4712e045: am 198c3387: Merge "Better Focus dimming support and some minor code cleanup." into lmp-mr1-ub-dev

* commit '3288d56a31e8e76c89b7e9b6fd13190fb34be777':