Merge "Always show transient indication in AOD"