Merge "Update shade side padding"