Merge "Volume panel should not clear system ui flags." into klp-dev