Merge "Re-route to default display if the home activity doesn't support multi-display" into sc-dev