Merge "Fix bug 5156213 - Fix title visibility states wrt expanded action views."