Merge "Fix but that avatar overlapping with status bar."