Merge "Revert "Update the layout to get aligned with framework change""