Merge "Restore display decoration if device supports it"