Merge "Restore force relayout logic for apps targeting < R" into rvc-dev