Merge "Use ShadeWindowGoesAround helper class instead of just reading the flag" into main