Merge "Windowshade visual cleanups."