Merge Pie controls: Fix flickering nav bar in full screen into cm-10.1

Change-Id: I56c09e99568b5c635c98db128c1045799a5dfe5d