Merge "PowerUI: Remove obsolete workaround." into lmp-preview-dev