Merge "Display time to charge on lock screen" into lmp-preview-dev