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

Change-Id: Ic50d17e4cca85c35899961a9cc3c250478d264f1