Merge "Detect support in ActivityManagerDockedStackTests." into oc-dev