Merge "Fix opacity of expanded shade during transitions"