Merge "Fixes bug where affordances are visible in AOD" into tm-qpr-dev