[master][PATCH] Activate default layout when it is changed (#882440)