Merge "Moving StickyKeyIndicator to use generic Dialog so it doesn't interfere with home gesture" into main