Merge "Update non-sandwiched notification corner radius"