Merge "Small fixes to power save UI." into lmp-preview-dev