Merge "Apply FAB fade effect in more cases" into main