Merge "Adding drop shadow support"