am 6aad318b: am 79eae0ad: Merge "Update active key backgrounds" into lmp-dev

* commit '6aad318bd20fc55a2cd356699a1797db33ba236b':