Merge "Use Falsing Manager for media player taps" into sc-v2-dev