Merge Pie controls: Catching activation corner cases into cm-10.1

Change-Id: I31aa768e686f1b41d511bbb9ed77d8b646c04b03