Merge "Adding a flag to support activity overlay on home screen" into main