Merge "Introduce new API for floating window support"