Merge "Set windowElevation to 0 on watch dialogs."