Merge "Re-enabling fade-in of header bar icons."