Merge "Fix black screen after moving top activity to another display" into sc-dev