Merge "Do not apply rounded corner background to task bar when it's in phone mode" into main