Merge "Only ripple rotate btn if attached to window" into pi-dev am: 412a362c74
am: 8dea2c0039

Change-Id: Id1e4835db4197699a79c9a2ddaa65b77464bda0a