Merge "Decouple HeadsUpManager and ScrollContainer from remote input classes"