Merge "Fix HINT_STATE not tracking the entire height of the screen" into sc-dev