Merge "Mark compat UI hints as shown only if they are actually shown"