Merge "Only ripple rotate btn if attached to window" into pi-dev