Merge "Move OpenCloseListener and TrackingStartedListener out of ShadeViewController" into main