Merge "Initial implementation of dismiss gesture + inline settings icon" into nyc-dev